2011-05-06  Flick  <Flick>

[b2e401183d36] [1.1 beta 6]
* Merge


